Skip to content

feat: Implement infinite scrolling for Budget Discussions List #301

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

Merged
MihajlovicMilos1995 merged 1 commit into from
May 30, 2025
Merged

feat: Implement infinite scrolling for Budget Discussions List #301

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
62 changes: 49 additions & 13 deletions pdf-ui/src/components/BudgetDiscussionsList/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ const BudgetDiscussionsList = ({
}) => {
const theme = useTheme();
const sliderRef = useRef(null);
const observer = useRef();

const [showAll, setShowAll] = useState(false);
const [budgetDiscussionList, setBudgetDiscussionList] = useState([]);
Expand Down Expand Up @@ -208,6 +209,24 @@ const BudgetDiscussionsList = ({
setIsAllProposalsListEmpty,
]);

const lastBudgetProposalRef = useCallback(
(node) => {
if (observer.current) observer.current.disconnect();
observer.current = new window.IntersectionObserver((entries) => {
if (
entries[0].isIntersecting &&
currentPage < pageCount &&
budgetDiscussionList.length > 0
) {
fetchBudgetDiscussions(false, currentPage + 1);
setCurrentPage((prev) => prev + 1);
}
});
if (node) observer.current.observe(node);
},
[currentPage, pageCount, budgetDiscussionList.length]
);

return budgetDiscussionList?.length === 0 ? null : (
<Box overflow={'visible'}>
<Box
Expand Down Expand Up @@ -293,21 +312,38 @@ const BudgetDiscussionsList = ({
) ? (
<Box>
<Grid container spacing={4} paddingY={4}>
{budgetDiscussionList?.map((bd, index) => (
<Grid item key={index} xs={12} sm={6} md={4}>
<BudgetDiscussionsCard
budgetDiscussion={bd}
isDraft={isDraft}
startEdittingDraft={startEdittingDraft}
startEdittinButtonClick={
startEdittinButtonClick
{budgetDiscussionList?.map((bd, index) => {
const isLast =
index === budgetDiscussionList.length - 1;
return (
<Grid
item
key={index}
xs={12}
sm={6}
md={4}
ref={
isLast
? lastBudgetProposalRef
: null
}
/>
</Grid>
))}
>
<BudgetDiscussionsCard
budgetDiscussion={bd}
isDraft={isDraft}
startEdittingDraft={
startEdittingDraft
}
startEdittinButtonClick={
startEdittinButtonClick
}
/>
</Grid>
);
})}
</Grid>

{currentPage < pageCount && (
{/* {currentPage < pageCount && (
<Box
marginY={2}
display={'flex'}
Expand All @@ -325,7 +361,7 @@ const BudgetDiscussionsList = ({
Load more
</Button>
</Box>
)}
)} */}
</Box>
) : (
<Box py={2}>
Expand Down
1 change: 0 additions & 1 deletion pdf-ui/src/components/ProposalsList/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ const ProposalsList = ({
} else {
setProposalsList((prev) => [...prev, ...proposals]);
}
console.log('🚀 ~ fetchProposals ~ proposals:', proposals);
setPageCount(pgCount);
} catch (error) {
console.error(error);
Expand Down